iconfactory: Move private functions into private header

diff --git a/gtk/deprecated/Makefile.inc b/gtk/deprecated/Makefile.inc
index cdb6bc608df597d66201b1cdd602dc4309e3bcdb..7e0e08bdd06286eeb5de80675760162495d02447 100644 (file)
--- a/gtk/deprecated/Makefile.inc
+++ b/gtk/deprecated/Makefile.inc
@@ -42,6 +42,7 @@ deprecated_h_sources =                        \
 
 deprecated_private_h_sources =                 \
        deprecated/gtkgradientprivate.h         \
+       deprecated/gtkiconfactoryprivate.h      \
        deprecated/gtknumerableiconprivate.h    \
        deprecated/gtkstylepropertiesprivate.h  \
        deprecated/gtksymboliccolorprivate.h

diff --git a/gtk/deprecated/gtkiconfactory.h b/gtk/deprecated/gtkiconfactory.h
index 763b6b2400df07f6b7f6df8ab74008adc649aa73..7b5c54023b0498055ed865b1fbb0e9d05fc816e3 100644 (file)
--- a/gtk/deprecated/gtkiconfactory.h
+++ b/gtk/deprecated/gtkiconfactory.h
@@ -221,11 +221,6 @@ GtkStateType     gtk_icon_source_get_state                (const GtkIconSource *
 GDK_DEPRECATED_IN_3_10
 GtkIconSize      gtk_icon_source_get_size                 (const GtkIconSource *source);
 
-
-/* ignore this */
-GList* _gtk_icon_factory_list_ids (void);
-void _gtk_icon_factory_ensure_default_icons (void);
-
 G_END_DECLS
 
 #endif /* __GTK_ICON_FACTORY_H__ */

diff --git a/gtk/deprecated/gtkiconfactoryprivate.h b/gtk/deprecated/gtkiconfactoryprivate.h
new file mode 100644 (file)
index 0000000..8902b71
--- /dev/null
+++ b/gtk/deprecated/gtkiconfactoryprivate.h
@@ -0,0 +1,26 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2015 Benjamin Otte <otte@gnome.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GTK_ICON_FACTORY_PRIVATE_H__
+#define __GTK_ICON_FACTORY_PRIVATE_H__
+
+#include <gtk/deprecated/gtkiconfactory.h>
+
+GList *     _gtk_icon_factory_list_ids                  (void);
+void        _gtk_icon_factory_ensure_default_icons      (void);
+
+#endif /* __GTK_ICON_FACTORY_PRIVATE_H__ */

diff --git a/gtk/deprecated/gtkstock.c b/gtk/deprecated/gtkstock.c
index bfc75e7534a5cf3e957b6a38fd23ad9655743ae4..a73e917812e54ba0f672365032c5d4e90342a074 100644 (file)
--- a/gtk/deprecated/gtkstock.c
+++ b/gtk/deprecated/gtkstock.c
@@ -31,6 +31,7 @@
 #include "gtkprivate.h"
 #include "gtkstock.h"
 #include "gtkiconfactory.h"
+#include "gtkiconfactoryprivate.h"
 #include "gtkintl.h"
 
 /**